FORGEPLUGINS-161 minor enhancements