Fix all issues introduced in various commits by CM and me.. yeah my bad!

PS 2 : Fixed Build

Change-Id: I25cfa75aec01e4e01c28826410ebca5cc5bcc50f