Small fixes
Clean up