Fix some last d&d and title issues