Design minor fixes