Removed deprecated function calls and fixed plugins