Few minor fixes to fix a build failure