Fixes for lint and travis