Changed 'uid' from 'auto' to '@uid' where appropriate.