clean commit: fixes to make build work