Things missed from last commit