Bug fixes and error descriptions