Fixes for Issue #50, #55, and #61