Some fixes.

aaa