Command block fixes 2