Small changes to get ready for accepting actual commands