Minor changes to address Travis build errors