Fixes
More cleanup