Merge "Fix some compiler warnings"