plexi fixes
Merge branch 'plexi'