Proper plugin linking and bug fixes