Various clean fixes