Fixes for Issue 58 and 63