Clean up of warnings