Bug fixes and updaters