Updated spec to work across Client API changes
Minor makefile change