Bug fixes and jazz