platform fixes
Merge pull request #1 from qadan/7.x

platform fixes