Bug fixes and updates