Committing a couple of software only mode issues