Bug fixes and licensing