Fixes

fixes CG-CamSys/Backlog#275 and CG-CamSys/Backlog#270