Couple outstanding bugs