Prepare for cloud9, fix some issues.