more foo fixes...