Some changes for conformance

Changing stuff based on lint on pod spec