Fixed up some stuff I missed with last diff.