Performance & stability fixes