minor fixes and workaround to handle dl_method 3...