Fix some over-shaddowing of variables

Fix some over-shaddowing of variables