Fixes for autoconfig