Minor improvements to stub file