Last tweaks for Initial plugin submission