Fix typo and build fix