Cleanup warnings (more...)