Removed PHP warnings