Fixes.

Pushing to dev-freeze because I want to minimize conflicts with master when we merge.