Fixes to autodetection and services