More command fixing