Clearing up some notices