Nightly Commit~

Fix some of bugs