Updates for better mod interoperability