Fixed issue in #1010, #1012

All is good now.

All in one commit.

No copyrighted content...

![areyouhappynowfalco](https://f.cloud.github.com/assets/4262327/1068171/39ce0538-13e5-11e3-8434-623fab38ab20.jpg)

Death stare time. This is driving me nuts all this formality bullshit.