Fix for one regression issue and one PHP notice