Fix always-pulling bug, update helper logic