Add in brian's fixes