More fixes from Meghna as she tries to compile
More fixes from Meghna as she tries to compile

open-power/eCMD,mklight/eCMD,mklight/eCMD,mklight/eCMD,mklight/eCMD,open-power/eCMD,mklight/eCMD,open-power/eCMD,open-power/eCMD,open-power/eCMD