More PHP Notices removed (part 2)