Fixed some errors found in cloud9