Port Fixes for #61