Merge "Fix compiler warnings"