Aaaaand more fixes