Bugfixes in code completion