Fixed a couple of bugs and added another helper.