1.6.1 Minor Fixes