Custom fields and guest checkout fix

Some syntax error fixes