Merge bug fix, about fix, remove fix.