Slightly improved helpers