fixed more notices