Fixing issues in FakeWP