Cleanup warnings
Some more cleanup