gda-diamond: fix various warnings