Cleanup some warnings