Further bug fixing.