Cleanup fixes