Fixes for Issue#142