(Manual: minor fixes)