Small comsetic fixes