Minor fixes for build