Reintroduce manual BOM detection since charade/chadet often miss them