Fix up some basic commands a little bit.