Fix remaining compiler warnings in master