Make SOC fixes

As per http://goo.my/z6j