Solve lot of warnings