Add a couple more useful helpers