Nick's fixes