Fix for schema build errors