Changed some stuff to match PostgreSQL 7.2