Minor tweaks here and there
no changes anymore, just compatibility checks