Warning/error cleanup, hopefully