Some fixes

Some fixes I've come up with while playing a bit with crow.
I hope the commit messages are pretty clear.