Tiny fixes broken by last commit