Adding more fixes to Issue #205