Fixes for FB detection