Noticifation bug
Fixed warnings