Minor changes and/or fixes.