More PHP Notices removed (part 21)