Few minor fixes after redesign phase