Patches for Issues #251 #263 #265 #267