Fixing Jason's bugs.