some diamond fixes