Minor fixes to allow travis build to pass