Minor code completion improvements