Add a fwe more fixes