Bug fixes for designs A & B