Fixed a bug with the new race condition fix. Moving the schemas to the application would be good.
Fixed another bug related to the race condition fix.