Fix notices

Slightly less bugs.