Cleaned up possible PHP Notices.