Run down fixes