Final fixes (hopefully)