Fixes Bug 1038389 - Make Your Own minor bugfixes