Fix some smelly stuff