doctrine fixes