Various FF13 improvements