Resolve compilation issues. Remove more SETERRQs.