Fixes & start of plugin loading