base

Fix build.

clicked "submit" on I65ae29bd when I shouldn't have.

Fixing according to comments and a build error change.