Here are the fixes for a few issues found in the conditional fields