Make prepare stage as complete as possible