Fixing Matt's mistakes