Minor fixes
.