Sourcedict + address identifier fixes