Couple more changes regarding PHP Error Notices