Fixes & cleaning