ST3 tweaks. #22