Adapts and fixes