Various Fixes.

剪輯者：Voshon_