Fixes and more

Change-Id: If6ede79c35c4de1e686cf2e1a6d7641af8386bee