adding some solutions that I had lying around.  Note that these are actually patches for the corresponding files.