Fixed some errors from Yun development