Minor fixes

Fixing failed build.