Few changes for use with ppcd