Some minor Improvements.