Staging Pollux Windy

Also fix some in Pollux

Change-Id: Ic306774db581366ee0aa6ad2ec4d3a5d504d78cf
Signed-off-by: DHOMD <DHO@dho.im>