Some insane fixes