Fixing subclaim bugs