merge smaller fixes