Fixes for scope builder added postfix increment