bug fixes for adaptive