Fixes for filtering and travis