Small fixes to support conditionals. Seems to work!