Cleanup of warnings