Some fixes in design.