Some smaller fixes.