Various small fixes.
Version 1.8.1.pl-2