Updated for bugfixes in YATSM