Fixing Steven's bugs.