Add a few things from bungee version