More PHP Notices removed (part 6)