Miscellanous updates

Credits to @arco for that, I just needed more specific stuff from ADC
and I'm lazy to make two commits. Ref.:
f89ee8ebf9f639d0efa82e7b27608746daebc6ab