small fixes to avoid another merge conflict.