Additional designs and fixes