Minor code improvements on backlog.