BJORN: Fixing minor bugs

Fixing minor bugs