Fix some warnings
Cleanup