Add a couple more utils