Correction of small design bugs