Brian fixes to stuff