BJORN: Bug fixes

Bug fixes