Fix two fixes missing from last commit