Merge pull request #264 from ARMmbed/misc

Misc improvements