'amount' field is now required

Also, begin to clean up some missing field warnings.

Change-Id: If35da918d32a7040712b2fd0424cbb5da9fb4cf7