Catching up on fixes
Cleanup