Fix some notices.
Fix some more notices.