Fixes.
Still some problems.