Fix unbound variables