More small bugs fixed.
More small bugs fixed.