FORGEPLUGINS-161 more minor enhancements