Modifications to fix travis building (Local building is fine so far)