fix bundle id issues