Some fixes.

I've pushed some fixes.