Minor changes to enable Travis build