fixing the rest of the shit I forgot...

Change-Id: I46fe11a31832207406c975ac1ba8903496a66662
Merge "fixing the rest of the shit I forgot..." into production