Removing license check bugs