Design minor changes