Annnd more fixes