Axxionize some things

Change-Id: Ibcebac66aeede9916222c7462cef4768d40d6f47