Some bugs fixed (again).