a couple fixes, based on PR and travis