Minor bugs shored up.