Just fixes and clean up