Fix some bugs.
Merge branch 'release/TwistedMonkey'