- adaptarization fixes