Rabbit fixes