Small minor fixes