Consistency fixes
Cleaner way of getting plugin without needing to change UhcCommandExecutor