Small fota generation changes