Remove two small bugs