Helper methods for compat with old code