Fixed regression bugs.