BJORN: bug fixes

bug fixes