Some changes/fixes.