Another minor fixes