Fixes

Some more fixes.