Merge "Fix compiler warnings" into eider