OOps, two small bugs, fixed