Fix issue with NOTICE. Updates planned for this