Some more bug-fixes.