Fixed some autofill and tooltip issues