Some fixes for multiple geometry columns.