some small bugfixes depending Flagbit setup