Bufgixes for issues 51, 48