Some more smaller fixes.