Fixes & clean up