Small changes and fixes, etc