Small changes and fixes.
Small fixes and improvements.