Some fixes.
?