Add some helpers from nailer