Fix polthergeist issues