Remove notices and fixes #6