Minor final touch fixes