Cosmetic fixes after framework update

@njx please review.