Fixes.
Sorting out more bugs.