Minor alterations: bug fixes.