Minor changes needed for successful plugin compiling