adaptation fixes