Conditional check bugfixes