Fix some issues with Schema resolution.