Lisa bugfixes1

This can be closed or deleted.  It is an accidental duplicate and should have been submitted to the OTI fork.