Fixes

Fix duplicate entries in computed and observer support maps.