Fix all the comparison issue in fb dev servers