Fixes, so many little fixes

Change-Id: I5dd87d88f28926ffd0cec2000dd1ca46da153132