Some more fixes

Some more fixes.