More resource & stability fixes