compatibility arch / tweaks, tests and imports updates