Fixed up some stuff from the beallio merge