auto related and other fixes