Schema updates and fixes