Fix some trivial stuffs