Fixes for compound operators with variables