Dark stuff fixes