Fixed last compiler warnings wrt #480