Make minor fixes