Rectify design errors