Final fixes :)

Change-Id: I31414632ca6e4321a470aa09f7aaa5016192263f