Error message fixes and other updates.