Obs detected bugs

Jonathan Wilkesrequested to merge
obs-detected-bugs into master

fixes for some of the bugs listed in #548

Merge request reports