Patches for Issues #274, #280, #281