Minor fixes with dashbaorD