Some fixes so it can load the latest .strf format