A fixed a few small issues.