pulled in Neils fix for the second bug (checking block compatibility on deletion)