Fixed plugins on Linux

This reverts 2c0bc70 and some of 77b3fc8