BF: couple of tiny bugs