Small fixes because mental model didn't match python engine