Small fixes
Full pass