Fixes/cleanups