Bug fixes and original values