#60 Minor Improvements