Make SOC fixes

As per http://goo.my/2tt
Merge pull request #123 from MaikeruS/patch-2

Make SOC fixes