Error fixes from modesti

Received via email, many thanks.