More speed tweaks

Change-Id: I7e7d7d29da1cc9cc72a0d8fa21c89dea26b7bade