Minor fixes for pi and windows builds.