Final fixes (I hope)