Few fixes (BOM!)