Fix some errors of the design