Fixed some bugs with Notice's