Fixes and clean ups