Fixes to combinational.py