Fixes/clean up