Fixed errors in compiling, additional commit to mms fix.

Change-Id: I7be4c915844ab5e9dcb4ed5d36352d79ce9ad123