Resolve the differences between master and ks

A few random changes from prod that needed to be added to master.