fixes for auto