Fix helper methods to not rely on pyeqs