License updates, bug fixes and misc.