Fixes for issues noticed by Travis.