Fix ListCommand etc in Project