further designs fixes