Add a few convenient methods - fixed things - etc