Plugin loader & fixes