Minor cleanup and plugin updates.