Some bug repairs.