Updates/fixes to only support 9.2 and up.