Update for latest version & fix error messages.