Pg ossp extension & nested fixes