plexi fixes
Merge branch 'plexi' into dondavici