fixes for adaptive