Fixes

The fixes we talked about.