Bug fixes, bug fixes everywhere!