Started removing warnings from non-BM* PHP files