Company License Fixes