Import fixes

![53827961](https://cloud.githubusercontent.com/assets/131186/4962730/e9587042-66e6-11e4-9fdf-13079770deb2.jpg)