Process life cycle fixes