Multiple changes/fixes.