bugfixes for Fb Linter