(Mod) Teahandler fixes
(Mod) Teahandler fixes