More bug fixing.