Some fixes for geocat so some tests pass