Small bugs (part 2)