Fixes & cleanups