more small fix