minor fixes for failing tests