Some fixes from the platform
Merge pull request #1149 from elinw/30001

Some fixes from the platform