fixes for Kate's design review