Fixed several instance scope errors.

OMG the pull request functionality got a LOT more complicated for no apparent reason. Stupid Github. =P