Bug fixes

This should solve both USH-91 and USH-107