Cleanup warnings and other stuff