Getting rid of 2 notice errors