Chameleon compatibility changes suggested by RehabMan