Fixed some minor defects

![Panda_1_1654644a](https://f.cloud.github.com/assets/1041097/186118/405752b2-7d20-11e2-97f3-112f82463fb3.jpg)