Make some helpers public