More PHP Notices removed (part 22)