Fix class bindings in single machine view