Fixes

Many fixes.