some adaptive fixes

thanks to @d00ker