Bug fixes and other items