Enumeration fixes

- Change .Init to .InitPID where appropriate (the enumerations are different)
- Change integer literals to enumerations (since it is a type error to try to compare integers to enumerations)