Fix issue with plugins not loading correctly