Removed juvia support, other fixes