Fixed bugs.

All yours Alex.