Fix-up final nits