Fix remaining commit errors