Clean up some warnings
Fix some more warnings