clean-up field disambiguation warnings and others