fixes to observer