Issue 747 - fix some PHP notices