Tried some more fixes